Add support for EnterpriseOwner by jackmtpt · Pull Request #3211 · integrations/terraform-provider-github

jackmtpt · 2026-02-20T14:54:20Z

Resolves #3210

Before the change?

Adds support for setting EnterpriseOwner in rulesets

After the change?

The EnterpriseOwner value can be set as a bypass_actor

Pull request checklist

Schema migrations have been created if needed (example)
Tests for the changes have been added (for bug fixes / features)
Docs have been reviewed and added / updated if needed (for bug fixes / features)

Does this introduce a breaking change?

Please see our docs on breaking changes to help!

Yes
No

github-actions · 2026-02-20T14:54:30Z

👋 Hi! Thank you for this contribution! Just to let you know, our GitHub SDK team does a round of issue and PR reviews twice a week, every Monday and Friday! We have a process in place for prioritizing and responding to your input. Because you are a part of this community please feel free to comment, add to, or pick up any issues/PRs that are labeled with Status: Up for grabs. You & others like you are the reason all of this works! So thank you & happy coding! 🚀

jackmtpt · 2026-02-20T14:57:17Z

I don't have a local golang dev environment so I'll have to wait for the CI build before I can test this locally.

deiga

Thanks for the contribution! I left a few comments

deiga · 2026-02-23T12:12:07Z

Thanks for the changes! Have you been able to run the tests locally?

jackmtpt · 2026-03-02T09:12:28Z

Thanks for the changes! Have you been able to run the tests locally?

Sadly not; setting up a golang dev environment in my company has proven to be a giant pain...

deiga · 2026-03-03T17:56:38Z

Ran tests locally and they pass on Enterprise. But I think you need to split the tests with EnterpriseOwner into separate tests with skipUnlessEnterprise

jackmtpt · 2026-03-05T15:59:22Z

That should be done now. There was an existing test create_branch_ruleset_with_enterprise_features that I've changed to be gated behind the enterprise setting and put the EnterpriseOwner stuff in that. I've then copied that test to the org rulesets file as well.

I'm still pretty new to golang but I have managed to get the tests passing locally.

deiga

LGTM!

deiga · 2026-04-26T19:27:11Z

+			Steps: []resource.TestStep{
+				{
+					Config: config,
+					Check: resource.ComposeTestCheckFunc(


Could you refactor this to use ConfigStateChecks instead of Check?

deiga · 2026-04-26T19:28:25Z

Could you create a new test for this, instead of changing this existing test and where it can run?

my understanding of the existing create_branch_ruleset_with_enterprise_features test was that it should have been using skipUnlessEnterprise(t) already, no? if it's testing enterprise features then shouldn't it only run in enterprise mode?

happy to split out the specific EnterpriseOwner test if you want, i just thought it'd be simpler to have one test that does all the enterprise-y stuff together

…ot be set according to the API docs https://docs.github.com/en/enterprise-cloud@latest/rest/orgs/rules?apiVersion=2022-11-28#create-an-organization-repository-ruleset

Co-authored-by: Copilot <copilot@github.com>

deiga requested changes Feb 20, 2026

View reviewed changes

Comment thread github/resource_github_organization_ruleset.go Outdated

Comment thread github/resource_github_organization_ruleset_test.go Outdated

Comment thread website/docs/r/organization_ruleset.html.markdown Outdated

deiga approved these changes Mar 5, 2026

View reviewed changes

deiga requested a review from stevehipwell March 5, 2026 22:42

deiga added this to the v6.12.0 Release milestone Mar 5, 2026

deiga modified the milestones: v6.12.0 Release, v6.13.0 Release Apr 14, 2026

deiga requested changes Apr 26, 2026

View reviewed changes

jackmtpt and others added 8 commits April 30, 2026 09:35

allow EnterpriseOwner in ruleset

9ff3e9b

add test case for EnterpriseOwner

b0c9875

update resource docs

b8bf8b3

remove actor_id for the org admin + ent owner cases where it should n…

1647d38

…ot be set according to the API docs https://docs.github.com/en/enterprise-cloud@latest/rest/orgs/rules?apiVersion=2022-11-28#create-an-organization-repository-ruleset

fix count in test

b480640

support ent owner in non-org rulesets as well

1293372

only run the enterpriseowner tests in enterprise mode

cdeca29

use ConfigStateChecks instead

2df5697

Co-authored-by: Copilot <copilot@github.com>

jackmtpt force-pushed the jackmtpt-patch-1 branch from 2864337 to 2df5697 Compare April 30, 2026 10:18

Conversation

jackmtpt commented Feb 20, 2026

Before the change?

After the change?

Pull request checklist

Does this introduce a breaking change?

Uh oh!

github-actions Bot commented Feb 20, 2026

Uh oh!

jackmtpt commented Feb 20, 2026

Uh oh!

deiga left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

deiga commented Feb 23, 2026

Uh oh!

jackmtpt commented Mar 2, 2026

Uh oh!

deiga commented Mar 3, 2026

Uh oh!

jackmtpt commented Mar 5, 2026

Uh oh!

deiga left a comment

Choose a reason for hiding this comment

Uh oh!

deiga Apr 26, 2026

Choose a reason for hiding this comment

Uh oh!

jackmtpt Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

deiga Apr 26, 2026

Choose a reason for hiding this comment

Uh oh!

jackmtpt Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants